From: Joakim Verona <joakim@verona.se>
Date: Tue, 13 Aug 2013 18:16:27 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=f0a5c7bd7d1654efded1a93b71b662d815d18ef8;p=emacs.git

merge from trunk
---

f0a5c7bd7d1654efded1a93b71b662d815d18ef8